Put the trash icon on the right for LTR locales, or on the left for RTL.

2004-03-11  Federico Mena Quintero  <federico@ximian.com>

	* gtk/gtkfilechooserdefault.c (shortcuts_drag_set_delete_cursor):
	Put the trash icon on the right for LTR locales, or on the left
	for RTL.
	(shortcuts_drag_motion_cb): Cancel the idle handler here as well.
	(shortcuts_drag_leave_cb): Test whether the idle is present.
	(shortcuts_drag_data_received_cb): Ahem, don't assert here.

diff --git a/ChangeLog b/ChangeLog
index 0b69b6498fed05fb34a7b65c40d13198769647ad..37cc48e2925676556875ca4361c90939e9f68195 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
        for RTL.
        (shortcuts_drag_motion_cb): Cancel the idle handler here as well.
        (shortcuts_drag_leave_cb): Test whether the idle is present.
+       (shortcuts_drag_data_received_cb): Ahem, don't assert here.
 
 Thu Mar 11 17:51:10 2004  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0b69b6498fed05fb34a7b65c40d13198769647ad..37cc48e2925676556875ca4361c90939e9f68195 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -5,6 +5,7 @@
        for RTL.
        (shortcuts_drag_motion_cb): Cancel the idle handler here as well.
        (shortcuts_drag_leave_cb): Test whether the idle is present.
+       (shortcuts_drag_data_received_cb): Ahem, don't assert here.
 
 Thu Mar 11 17:51:10 2004  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0b69b6498fed05fb34a7b65c40d13198769647ad..37cc48e2925676556875ca4361c90939e9f68195 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -5,6 +5,7 @@
        for RTL.
        (shortcuts_drag_motion_cb): Cancel the idle handler here as well.
        (shortcuts_drag_leave_cb): Test whether the idle is present.
+       (shortcuts_drag_data_received_cb): Ahem, don't assert here.
 
 Thu Mar 11 17:51:10 2004  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0b69b6498fed05fb34a7b65c40d13198769647ad..37cc48e2925676556875ca4361c90939e9f68195 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -5,6 +5,7 @@
        for RTL.
        (shortcuts_drag_motion_cb): Cancel the idle handler here as well.
        (shortcuts_drag_leave_cb): Test whether the idle is present.
+       (shortcuts_drag_data_received_cb): Ahem, don't assert here.
 
 Thu Mar 11 17:51:10 2004  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0b69b6498fed05fb34a7b65c40d13198769647ad..37cc48e2925676556875ca4361c90939e9f68195 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -5,6 +5,7 @@
        for RTL.
        (shortcuts_drag_motion_cb): Cancel the idle handler here as well.
        (shortcuts_drag_leave_cb): Test whether the idle is present.
+       (shortcuts_drag_data_received_cb): Ahem, don't assert here.
 
 Thu Mar 11 17:51:10 2004  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index d25577781fe7b04b861ee26a764ca6fe7c1f5769..9f91b1072f0f29e08007fad5a092a40a5ca4a4f0 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -2284,7 +2284,6 @@ shortcuts_drag_data_received_cb (GtkWidget          *widget,
   int bookmarks_index;
 
   impl = GTK_FILE_CHOOSER_DEFAULT (data);
-  g_assert (impl->shortcuts_drag_outside_idle == NULL);
 
   /* Compute position */